up version to 1.3.8, interface age 0, binary age 0, depend on glib 1.3.8.

Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>

        * configure.in: up version to 1.3.8, interface age 0,
        binary age 0, depend on glib 1.3.8.

        * NEWS: 1.3.8 updates.

diff --git a/ChangeLog b/ChangeLog
index 8fe10fdaac36126aa738fce9cd5e0c611cd09572..be9123b67272b80d62a3a7314ed2cb45d00fb34f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in: up version to 1.3.8, interface age 0,
+       binary age 0, depend on glib 1.3.8.
+
+       * NEWS: 1.3.8 updates.
+
 Tue Sep 18 18:46:54 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_start_editing): centralize all
@@ -1105,7 +1112,7 @@ Sun Aug 19 03:22:59 2001  Jonathan Blandford  <jrb@redhat.com>
        * tests/treestoretest.c: inserted some casts to get rid of compiler
        warnings.
 
-Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>>
+Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c
        (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell.
@@ -1216,7 +1223,6 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
->>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8fe10fdaac36126aa738fce9cd5e0c611cd09572..be9123b67272b80d62a3a7314ed2cb45d00fb34f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in: up version to 1.3.8, interface age 0,
+       binary age 0, depend on glib 1.3.8.
+
+       * NEWS: 1.3.8 updates.
+
 Tue Sep 18 18:46:54 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_start_editing): centralize all
@@ -1105,7 +1112,7 @@ Sun Aug 19 03:22:59 2001  Jonathan Blandford  <jrb@redhat.com>
        * tests/treestoretest.c: inserted some casts to get rid of compiler
        warnings.
 
-Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>>
+Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c
        (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell.
@@ -1216,7 +1223,6 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
->>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8fe10fdaac36126aa738fce9cd5e0c611cd09572..be9123b67272b80d62a3a7314ed2cb45d00fb34f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in: up version to 1.3.8, interface age 0,
+       binary age 0, depend on glib 1.3.8.
+
+       * NEWS: 1.3.8 updates.
+
 Tue Sep 18 18:46:54 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_start_editing): centralize all
@@ -1105,7 +1112,7 @@ Sun Aug 19 03:22:59 2001  Jonathan Blandford  <jrb@redhat.com>
        * tests/treestoretest.c: inserted some casts to get rid of compiler
        warnings.
 
-Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>>
+Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c
        (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell.
@@ -1216,7 +1223,6 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
->>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8fe10fdaac36126aa738fce9cd5e0c611cd09572..be9123b67272b80d62a3a7314ed2cb45d00fb34f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in: up version to 1.3.8, interface age 0,
+       binary age 0, depend on glib 1.3.8.
+
+       * NEWS: 1.3.8 updates.
+
 Tue Sep 18 18:46:54 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_start_editing): centralize all
@@ -1105,7 +1112,7 @@ Sun Aug 19 03:22:59 2001  Jonathan Blandford  <jrb@redhat.com>
        * tests/treestoretest.c: inserted some casts to get rid of compiler
        warnings.
 
-Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>>
+Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c
        (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell.
@@ -1216,7 +1223,6 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
->>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8fe10fdaac36126aa738fce9cd5e0c611cd09572..be9123b67272b80d62a3a7314ed2cb45d00fb34f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in: up version to 1.3.8, interface age 0,
+       binary age 0, depend on glib 1.3.8.
+
+       * NEWS: 1.3.8 updates.
+
 Tue Sep 18 18:46:54 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_start_editing): centralize all
@@ -1105,7 +1112,7 @@ Sun Aug 19 03:22:59 2001  Jonathan Blandford  <jrb@redhat.com>
        * tests/treestoretest.c: inserted some casts to get rid of compiler
        warnings.
 
-Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>>
+Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c
        (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell.
@@ -1216,7 +1223,6 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
->>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8fe10fdaac36126aa738fce9cd5e0c611cd09572..be9123b67272b80d62a3a7314ed2cb45d00fb34f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in: up version to 1.3.8, interface age 0,
+       binary age 0, depend on glib 1.3.8.
+
+       * NEWS: 1.3.8 updates.
+
 Tue Sep 18 18:46:54 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_start_editing): centralize all
@@ -1105,7 +1112,7 @@ Sun Aug 19 03:22:59 2001  Jonathan Blandford  <jrb@redhat.com>
        * tests/treestoretest.c: inserted some casts to get rid of compiler
        warnings.
 
-Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>>
+Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c
        (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell.
@@ -1216,7 +1223,6 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
->>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8fe10fdaac36126aa738fce9cd5e0c611cd09572..be9123b67272b80d62a3a7314ed2cb45d00fb34f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Sep 18 23:51:49 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in: up version to 1.3.8, interface age 0,
+       binary age 0, depend on glib 1.3.8.
+
+       * NEWS: 1.3.8 updates.
+
 Tue Sep 18 18:46:54 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_start_editing): centralize all
@@ -1105,7 +1112,7 @@ Sun Aug 19 03:22:59 2001  Jonathan Blandford  <jrb@redhat.com>
        * tests/treestoretest.c: inserted some casts to get rid of compiler
        warnings.
 
-Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>>
+Sun Aug 19 01:44:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeviewcolumn.c
        (gtk_tree_view_column_pack_{start,end}_cell_renderer): sink cell.
@@ -1216,7 +1223,6 @@ Wed Aug 15 12:36:55 2001  Tim Janik  <timj@gtk.org>
 
        * gtk/demos/gtk-demo/*: Remove all uses of deprecated functions.
 
->>>>>>> 1.2276
 2001-08-17  Anders Carlsson  <andersca@gnu.org>
 
        * gtk/gtkstyle.c (create_expander_affine): Divide with floating

diff --git a/NEWS b/NEWS
index 80d2e3421f29a751837c20365c768e0321006a51..ff0fd129d09568f930872e279d897cf8d6d52900 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of Changes in GTK+ 1.3.8
+=================================
+
+* GtkTreeView and GtkTreeModel API cleanups/improvements [Jrb]
+* GtkOptionMenu scrollwheel support [Alex]
+* GtkModule search paths [Owen]
+* Documenatation updates [Havoc,Jrb]
+* Major Gdk cleanup [Owen]
+* Miscellaneous other fixes/cleanups
+
+Other Contributors:
+  Joshua N Pritikin, Padraig O'Briain, Jakub Steiner, Matthias Clasen,
+  Matt Wilson, James Henstridge
+
 Overview of Changes in GTK+ 1.3.7
 =================================
 
@@ -33,6 +47,14 @@ Overview of Changes in GTK+ 1.3.7
 * Warning fixes [Darin Adler]
 * Miscellaneous bug and API fixes [Matthias et. al]
 
+Other Contributors:
+  Joshua N Pritikin, Hidetoshi Tajima, Manish Singh, ERDI Gergo, Jens Finke,
+  Chema Celorio, Lee Mallabone, Vitaly Tishkov, Sebastian Wilhelmi,
+  Nicola Girardi, Sven Neumann, Padraig O'Briain, Michael Natterer,
+  Suresh Chandrasekharan, Jonas Borgström, Jay Cox, Michael Meeks,
+  Mathias Hasselmann, Peter Williams, Thomas Broyer, Kjartan Maraas,
+  Joel Becker, Jeff Franks, Brian Cameron, Skip Montanaro
+
 Overview of Changes in GTK+ 1.3.6
 =================================
 

diff --git a/configure.in b/configure.in
index 4f1ee278a882e1a78d74787ab974a8c447110f9a..7c430f48887e209bc44b3eb5be5f8b420c16b212 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -34,7 +34,7 @@ GLIB_AC_DIVERT_BEFORE_HELP([
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=3
-GTK_MICRO_VERSION=7
+GTK_MICRO_VERSION=8
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -295,7 +295,7 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 # 
 
 GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
-GLIB_REQUIRED_VERSION=1.3.7
+GLIB_REQUIRED_VERSION=1.3.8
 
 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
   AC_MSG_ERROR([

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 30ffca8235aa804f9d0033f0f1ed9b6a61d8fd94..cc0b23b6d217a6b8beefca09d47e350a7eb6068a 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 

diff --git a/tests/prop-editor.c b/tests/prop-editor.c
index 50c25134b6502ae2b141d4994e00e7fb3a13951f..bbfa2163dc19ce28ba0eecfaed77959794335913 100644 (file)
--- a/tests/prop-editor.c
+++ b/tests/prop-editor.c
@@ -695,7 +695,7 @@ properties_from_type (GObject     *object,
          continue;
        }
 
-      label = gtk_label_new (spec->nick);
+      label = gtk_label_new (g_param_get_nick (spec));
       gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
       gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, i, i + 1);
       
@@ -707,8 +707,8 @@ properties_from_type (GObject     *object,
           if (!can_modify)
             gtk_widget_set_sensitive (prop_edit, FALSE);
 
-         if (spec->blurb)
-           gtk_tooltips_set_tip (tips, prop_edit, spec->blurb, NULL);
+         if (g_param_get_blurb (spec))
+           gtk_tooltips_set_tip (tips, prop_edit, g_param_get_blurb (spec), NULL);
          
           /* set initial value */
           g_object_notify (object, spec->name);